Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 2 Jun 2010 00:16:28 +0000 (00:16 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 2 Jun 2010 00:16:28 +0000 (00:16 +0000)
commit18b42e2f647c90c0e1f63c07a601dd99c10d4162
tree07135cbcaaefcb278bc5b68a9d7333e935e6d4cd
parentc011ecc1a1a2b746767fb076a025604c5a8a513b
parentf04e0f2cf082847cf921663743a393f63133a987
Merge from mainline.